summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."...Shukang Zhou2017-01-273-4/+15
|\
| * Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."Shukang Zhou2017-01-273-4/+15
| |\
| | * Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling."Treehugger Robot2017-01-273-4/+15
| | |\
| | | * [Frameworks] Add an 'am' cmd option to enable streaming in profiling.Shukang Zhou2017-01-253-4/+15
| * | | Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-masterLorenzo Colitti2017-01-2713-147/+349
| |\ \ \
* | \ \ \ Add hidden API for whether permission review mode is on.Paul Navin2017-01-272-0/+14
|\ \ \ \ \
| * | | | | Add hidden API for whether permission review mode is on.Paul Navin2017-01-272-0/+14
* | | | | | Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus...The Android Automerger2017-01-271-0/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Captive portals: login activity probes like NetworkMonitorHugo Benichi2017-01-261-0/+7
* | | | | | Merge commit '48a1136c8b3000c651e8bcd86325acd1dce6e4ec' into nyc-mr1-dev-plus...The Android Automerger2017-01-274-48/+116
|\| | | | |
| * | | | | Implement metered tracking for NetworkStats summary queries.Stephen Chen2017-01-264-48/+116
* | | | | | Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus...The Android Automerger2017-01-2710-94/+183
|\| | | | |
| * | | | | NetworkMonitor metrics: add first validation informationHugo Benichi2017-01-262-10/+37
| * | | | | Switch over to new "time.android.com" NTP pool.Jeff Sharkey2017-01-262-2/+10
| * | | | | Define API for metering network stats buckets.Stephen Chen2017-01-261-0/+42
| * | | | | VPN network stat accounting changes.Jeremy Joslin2017-01-261-7/+11
| * | | | | ConnectivityThread: use lazy holder idiomHugo Benichi2017-01-261-9/+14
| * | | | | ConnectivityManager: use ConnectivityThread looperHugo Benichi2017-01-261-39/+20
| * | | | | ConnectivityManager: a simpler CallbackHandlerHugo Benichi2017-01-261-37/+31
| * | | | | Indicate the NsdServiceInfo attributes are only filled in for a resolved serv...Philip P. Moltmann2017-01-262-6/+7
| * | | | | Add a null check for the OnStartTetheringCallback.Jeremy Klein2017-01-261-0/+3
| * | | | | IpConnectivityMetrics reads buffer size in settingsHugo Benichi2017-01-261-0/+7
| * | | | | Add option to skip and avoid captive portals.Calvin On2017-01-261-0/+34
| * | | | | Support timeouts for requestNetwork() invocations.Erik Kline2017-01-261-3/+24
* | | | | | Merge "Integration of the AAC codec for A2DP source" am: 22f97c83fbPavlin Radoslavov2017-01-261-3/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Integration of the AAC codec for A2DP source"Pavlin Radoslavov2017-01-261-3/+4
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Integration of the AAC codec for A2DP sourcePavlin Radoslavov2017-01-261-3/+4
* | | | | Fix @links in reference docs. am: 54de77470dElliot Waite2017-01-2623-55/+56
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix @links in reference docs.Elliot Waite2017-01-2623-55/+56
| |\ \ \ \
| | * | | | Fix @links in reference docs.Elliot Waite2017-01-2523-55/+56
| * | | | | Merge "Query for the settings package in KeyguardManager instead of hardcodin...Nancy Zheng2017-01-231-16/+22
| |\ \ \ \ \
* | \ \ \ \ \ Merge "nfc: Make NDEF validation stricter" am: f3a6269fedRuchi Kandoi2017-01-251-1/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "nfc: Make NDEF validation stricter"Ruchi Kandoi2017-01-251-1/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | nfc: Make NDEF validation stricterRuchi Kandoi2017-01-251-1/+4
| * | | | | | Merge "Change HFP Client API to support multi device"Sanket Agarwal2017-01-242-48/+18
| |\| | | | |
| | * | | | | Merge "Change HFP Client API to support multi device"Sanket Agarwal2017-01-242-48/+18
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Change HFP Client API to support multi deviceSanket Agarwal2017-01-202-48/+18
* | | | | | | Change HFP Client API to support multi deviceSanket Agarwal2017-01-232-48/+18
* | | | | | | Merge "Mark the INetworkScoreCache as oneway." am: edadb3efc3Jeremy Joslin2017-01-231-1/+1
|\| | | | | |
| * | | | | | Merge "Mark the INetworkScoreCache as oneway."Jeremy Joslin2017-01-231-1/+1
| |\| | | | |
| | * | | | | Mark the INetworkScoreCache as oneway.Jeremy Joslin2017-01-231-1/+1
* | | | | | | Query for the settings package in KeyguardManager instead of hardcoding it.Nancy Zheng2017-01-231-16/+22
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Query for the settings package in KeyguardManager instead ofNancy Zheng2017-01-201-16/+22
* | | | | | | Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780Polina Bondarenko2017-01-231-0/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Make TelephonyManager#get/setAllowedCarriers system api"Polina Bondarenko2017-01-231-0/+14
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Make TelephonyManager#get/setAllowedCarriers system api"Treehugger Robot2017-01-231-0/+14
| | |\ \ \ \ \
| | | * | | | | Make TelephonyManager#get/setAllowedCarriers system apiPolina Bondarenko2017-01-191-0/+14
* | | | | | | | Merge "Add Setting for curating saved open networks." am: b3b665de22Amin Shaikh2017-01-211-0/+10
|\| | | | | | |
| * | | | | | | Merge "Add Setting for curating saved open networks."Amin Shaikh2017-01-211-0/+10
| |\| | | | | |
| | * | | | | | Add Setting for curating saved open networks.Amin Shaikh2017-01-201-0/+10
| | | |_|/ / / | | |/| | | |