Amit Mahajan
5b8976a5ea
am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '853c61788387c38c1103f26b1c8c028da5676776':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:19:29 +00:00
Amit Mahajan
7278b04383
am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '895eb134751ec1495baa30362a514275624e5843':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:18:01 +00:00
Amit Mahajan
eee8634271
am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '9edf7ad563ead119698ac3106b699515bd160ffe':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:14:24 +00:00
Rich Slogar
268a7c190c
am fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
...
* commit 'fc7e84b36b77ac95e61bd1736eebdc307ba6e09e':
docs: manifest merger updates
2015-06-26 22:11:44 +00:00
Amit Mahajan
853c617883
am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:03:46 +00:00
Amit Mahajan
895eb13475
am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:03:10 +00:00
Rich Slogar
fc7e84b36b
Merge "docs: manifest merger updates" into lmp-docs
2015-06-26 21:56:25 +00:00
Prashant Malani
b3d02465f8
am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
...
* commit '9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab':
Revert "Always re-establish kernel alarms when considering new alarm set"
2015-06-26 21:12:49 +00:00
Prashant Malani
9a3eacbe9c
Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
2015-06-26 21:00:11 +00:00
Robert Schaub
cf05e31866
am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774
...
* commit '2a1be1bc387a97e86dac4d77d269d07eff71de41':
Docs: Added declaration to code fragment Bug: 21030774
2015-06-26 20:00:51 +00:00
Rich Slogar
66502afb0f
docs: manifest merger updates
...
Change-Id: I0a1c311ba08077b15ee1823146773b7d07162dd4
2015-06-26 12:45:24 -07:00
Robert Schaub
2a1be1bc38
Docs: Added declaration to code fragment
...
Bug: 21030774
Change-Id: Ic906454b20ec9606e5ca11a0fbd0388492eecf42
2015-06-26 11:11:19 -07:00
Amit Mahajan
791dd2c674
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:37 +00:00
Amit Mahajan
9edf7ad563
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:32 +00:00
Amit Mahajan
90224355cd
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:27 +00:00
Wei Liu
8346722850
am 6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry.
...
* commit '6f6326bc75be652a0b88b73fd6e0b73dbe2fabb6':
Implement a exponential backoff for NTP time and XTRA data retry.
2015-06-26 17:33:16 +00:00
Rich Slogar
3227921922
am fd3b64b8: am b0afc540: docs: Eclipse ADT end-of-life note
...
* commit 'fd3b64b8aa0aa974bcc69340e426cc0da92e71ae':
docs: Eclipse ADT end-of-life note
2015-06-26 07:06:31 +00:00
Rich Slogar
fd3b64b8aa
am b0afc540: docs: Eclipse ADT end-of-life note
...
* commit 'b0afc540ebee64ded367ce34ae8f61cb8c2478e7':
docs: Eclipse ADT end-of-life note
2015-06-26 06:53:20 +00:00
Rich Slogar
b0afc540eb
docs: Eclipse ADT end-of-life note
...
Change-Id: I5fe9de7145104191d330259c7e16ea14cc4a651e
2015-06-25 23:40:32 -07:00
Rich Slogar
4c96c7045e
am 7d377c3b: am fa5f184f: docs: studio migration guide
...
* commit '7d377c3b4f3837655c724b4508c7251d298f9765':
docs: studio migration guide
2015-06-26 05:52:55 +00:00
Rich Slogar
7d377c3b4f
am fa5f184f: docs: studio migration guide
...
* commit 'fa5f184faf7da28e3a6d2acd18bb9bfaac4eb2f1':
docs: studio migration guide
2015-06-26 05:39:31 +00:00
Rich Slogar
fa5f184faf
docs: studio migration guide
...
b/20093866
Change-Id: Ib1eed6870aaee6230a083ec5f126a36b4b3a014d
2015-06-25 22:28:33 -07:00
Wei Liu
6f6326bc75
Implement a exponential backoff for NTP time and XTRA data retry.
...
b/21904128
Change-Id: I9fc8917eed3065ff0a4946c5a3bdecb9e93da19d
2015-06-25 21:12:58 -07:00
Robert Schaub
ba12e22698
am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs
...
* commit '0b5d0509ad381fc7ab519a60e2d749f27db7a070':
docs: Removed sentence from permissions doc
2015-06-25 19:06:53 +00:00
Robert Schaub
0b5d0509ad
Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs
2015-06-25 18:57:08 +00:00
Bryce Lee
cb8f188191
Only enable theater mode by button press after setup.
...
Bug: 21751167
Change-Id: I7f69ff767aaea97829e8eb6f5f13faace1aae416
2015-06-25 10:54:06 -07:00
Anthony Hugh
a50fa71044
am 001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '001df9ca900f3098222a4920a0048d2eb947bd4e':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:27:41 +00:00
Prashant Malani
753e9e0f2d
Revert "Always re-establish kernel alarms when considering new alarm set"
...
This reverts commit c83d3e4b72f8f25bbac39a577f125f0ca04354da.
While the above patch does help deal with the issue of "lost" kernel
alarms, experiments found it to also cause the unnecessary duplicate
setting of non-lost alarms in other devices.
This leads to a situation where the CPU constantly tries to sleep, but
occasionally keeps failing to do so, because of a collection of these
duplicate alarms constantly activating the "alarm" kernel wakeup source
, presumably due to them being triggered.
These might have accumulated over several iterations when the kernel
alarms were set again (via rescheduleKernelAlarmsLocked()).
To prevent the CPU thrashing (which heavily drains power on more
battery-constrained devices, and increases the number of alarms being
set), the aforementioned commit is backed out.
Change-Id: I2a189cb303deb78a2faf476b0e789445407f3e11
(cherry picked from commit d19ffd4f2ca4130c41dd5f6baddad1830598ecbc)
2015-06-24 23:41:57 +00:00
Anthony Hugh
001df9ca90
DO NOT MERGE: Introduce stem keycodes for Wear
...
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
2015-06-24 16:13:19 -07:00
Joe Fernandez
1ee8470ca3
am 3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
...
* commit '3eefa1f9de9e6466251373074f3c720936b62a8c':
docs: Update Android support page
2015-06-24 21:38:28 +00:00
Joe Fernandez
3eefa1f9de
Merge "docs: Update Android support page" into mnc-preview-docs
2015-06-24 21:30:04 +00:00
Joe Fernandez
c5ab38f4af
docs: Update Android support page
...
- remove Helpouts
- remove Merchant issue reporting link
- remove other dead links
- clean up page code
b\18579472
b\19355066
Change-Id: If55aa57b11604bdd328c55e26ad5bd4ba0b32de7
2015-06-24 14:26:37 -07:00
Robert Schaub
f496648e2d
docs: Removed sentence from permissions doc
...
Bug: 21788582
Change-Id: Ifffed46dece0adb00671199c26c2fe995c4179ea
2015-06-24 13:19:49 -07:00
Andrew Solovay
f522215653
am 00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
...
* commit '00ebd145d1572e0d12403ed0194d540926996f0e':
docs: Added "Single Use Devices" video to Android for Work main page
2015-06-24 20:15:17 +00:00
Andrew Solovay
00ebd145d1
docs: Added "Single Use Devices" video to Android for Work main page
...
See first comment for doc stage location.
Change-Id: I0b64f8462eebc5d11c7972fd49147fdd1d6cdd3a
2015-06-24 11:56:56 -07:00
Luan Nguyen
c1b4b0580c
am c5a480d1: am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
...
* commit 'c5a480d112f6ce8645d9e294c42b2baab3b56ab9':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
2015-06-24 15:16:57 +00:00
Luan Nguyen
c5a480d112
am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
...
* commit 'fdad629fc089783fa0b3caad62ba99a9083f8645':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
2015-06-24 15:05:13 +00:00
Luan Nguyen
fdad629fc0
am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
...
* commit '6859a9f09049d1dc760b98a6cbb278b591de63a6':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
2015-06-24 14:51:30 +00:00
Luan Nguyen
6859a9f090
Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
2015-06-24 14:43:31 +00:00
Bryce Lee
91d2cbf447
am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
...
* commit '65dca454c7a717b001b51d0089e7565ba428ce87':
Turn off theater mode upon power button press.
2015-06-23 23:04:26 +00:00
Sharvil Nanavati
64a4858b32
resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev
...
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
2015-06-23 14:07:26 -07:00
Bryce Lee
65dca454c7
Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
2015-06-23 18:10:41 +00:00
Luan Nguyen
1afb2d5335
docs: Pare down the adb guide and remove sections that are duplicated
...
in the tools list.
bug: 12879186
Change-Id: Ic2d17ef29eac15a9ffc40e05b056dc17d71069e8
2015-06-22 17:00:02 -07:00
Dirk Dougherty
c8a94c5b6d
am 813d974e: Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
...
* commit '813d974e33366aaeeb54e242e2767d4eeaf940dc':
Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
2015-06-22 22:26:59 +00:00
Dirk Dougherty
813d974e33
Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
...
Change-Id: Ifb20f84560dc1c8655b8d216038a2b56777df460
2015-06-22 14:12:03 -07:00
Dirk Dougherty
bee8dc6275
am 19332345: Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
...
* commit '19332345516292c29bf1a52e896f7aba9bb30af6':
Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
2015-06-22 20:35:02 +00:00
Andrew Solovay
d043297ef4
docs: Clarified when you can put the fragments in the root view.
...
Per bug b/10641907, putting fragments in the root view *only* works
if the device runs Android 3.0 or later. Chris and Adam say
we don't really want to suggest that work flow even for these devices,
so I'm taking that info out.
bug: 10641907
Change-Id: Ie44acbb534b8e0cea8dbbfaaf2c65836b1c31be6
2015-06-22 13:27:47 -07:00
Sharvil Nanavati
7c2500564b
Dump bonded Bluetooth devices in dumpsys.
...
Change-Id: Ie509b0abc64cbc7813e9fe844ff4c05d8cb05f9d
2015-06-22 13:01:47 -07:00
Dirk Dougherty
1933234551
Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
...
Change-Id: I94b8cfbf5d0afab3d6e6db658a2e73817de9967c
2015-06-22 12:35:12 -07:00
Quddus Chong
0bdd320402
am 4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976" into mnc-preview-docs
...
* commit '4437a1294e26507449b48783a31b422d769af53b':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug: 21786976
2015-06-19 23:49:15 +00:00