211780 Commits

Author SHA1 Message Date
Billy Lau
337c069ac8 am 81451c1c: am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '81451c1c370c12d8d6125647e81e5ab5b67fab11':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:45:40 +00:00
Billy Lau
81451c1c37 am cb4bafb4: am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit 'cb4bafb4c97dc5e73b055ae1c0e4a548068062cd':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:38:08 +00:00
Dmitriy Ivanov
ad1cf03e80 Fix bug number for linker related workarounds
Bug: http:/b/24425865
Change-Id: Iba52acc99c8ff548ff875726988600ed230c988e
2015-09-28 10:37:49 -07:00
Billy Lau
cb4bafb4c9 am 86e153d5: am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit '86e153d5f0614c9f3da137fd0b815a398598928b':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:31:48 +00:00
Billy Lau
86e153d5f0 am f360bbca: Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev
* commit 'f360bbca969f60ee968240d22bc0b1f1e5e17218':
  Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE
2015-09-28 17:24:25 +00:00
Jae Seo
42934e65f5 am 6fb2da65: Merge "docs: fix a wrong link" into mnc-ub-dev
* commit '6fb2da6506b43347b388f9d4e4327767790f237e':
  docs: fix a wrong link
2015-09-28 17:23:48 +00:00
Billy Lau
f360bbca96 Merge "Bug: 24112165 Update docs for protection level of CHANGE_NETWORK_STATE" into mnc-dev 2015-09-28 17:18:30 +00:00
Jae Seo
6fb2da6506 Merge "docs: fix a wrong link" into mnc-ub-dev 2015-09-28 17:17:00 +00:00
Adam Lesinski
983c6d4d39 am b8126531: am d913782f: am d5f10154: Bump BatteryStats version
* commit 'b8126531c4275b5caf0132930a2cfc14344c20ce':
  Bump BatteryStats version
2015-09-28 07:12:49 +00:00
Adam Lesinski
b8126531c4 am d913782f: am d5f10154: Bump BatteryStats version
* commit 'd913782f1b48e1ef5928f869279c541e023d1cb7':
  Bump BatteryStats version
2015-09-28 07:06:55 +00:00
Adam Lesinski
d913782f1b am d5f10154: Bump BatteryStats version
* commit 'd5f10154c772b925f6527e25aeb8461de8c710cd':
  Bump BatteryStats version
2015-09-28 07:00:52 +00:00
Baligh Uddin
eee40898a9 am ab46a9ad: (-s ours) am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'ab46a9adf8b41d6b4c52d828131db531d456cc36':
  Import translations. DO NOT MERGE
2015-09-27 23:23:49 +00:00
Baligh Uddin
1e7304ba03 am 4ecf83e9: (-s ours) am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '4ecf83e99c50dbd1da6cada29e47ea5d1fffcfa2':
  Import translations. DO NOT MERGE
2015-09-27 23:23:43 +00:00
Baligh Uddin
ab46a9adf8 am a9abcc43: (-s ours) am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'a9abcc43ae71b907e6944ec0710834ef56801145':
  Import translations. DO NOT MERGE
2015-09-27 22:37:45 +00:00
Baligh Uddin
4ecf83e99c am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '4ac4ba5d1295b31a759609fd1e495cbf5e18ea64':
  Import translations. DO NOT MERGE
2015-09-27 22:37:39 +00:00
Adam Lesinski
d5f10154c7 Bump BatteryStats version
Bug:24434303
Change-Id: I697deb30c211c77c36cdd810259507f965f3b93b
2015-09-27 21:28:43 +00:00
Baligh Uddin
a9abcc43ae am edd35f92: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'edd35f922c492bb23d266c54e9c69505d3539680':
  Import translations. DO NOT MERGE
2015-09-27 20:55:44 +00:00
Baligh Uddin
4ac4ba5d12 am 0307a2a6: (-s ours) Import translations. DO NOT MERGE
* commit '0307a2a68dd4afceb480d1d0fdc792690ad88df7':
  Import translations. DO NOT MERGE
2015-09-27 20:55:40 +00:00
Baligh Uddin
edd35f922c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-27 04:05:09 +00:00
Baligh Uddin
0307a2a68d Import translations. DO NOT MERGE
Change-Id: Ibaf19bf407113bcedc96d367a80b3a7b1999f7c5
Auto-generated-cl: translation import
2015-09-26 13:05:11 -07:00
Baligh Uddin
63d93ba58a Import translations. DO NOT MERGE
Change-Id: I349825f72d9e929562abd599816a4ae428112ea6
Auto-generated-cl: translation import
2015-09-26 12:34:51 -07:00
Bryce Lee
18b76bf675 am 861559d3: am 24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
* commit '861559d31f61554cf79768d08b15be57b9a77a66':
  Add additional broadcast for when a phone account is unregistered.
2015-09-26 06:55:32 +00:00
Bryce Lee
979a22eaf9 am 6ad696c3: am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
* commit '6ad696c35b80f70f19de304b53bdbfc6f5a265d8':
  Add ThermalObserver system service to capture thermal state uevents.
2015-09-26 06:55:22 +00:00
Adrian Roos
7e9f6fbf0f am 47a497cf: am 1a6f9216: am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '47a497cf53fd86a93ee2965a4b33c9b3c20d0262':
  Show charging speed when time to full is available
2015-09-26 06:55:00 +00:00
Nick Vaccaro
09746d8980 am 5eccf896: am faf3f370: Merge "Fix sensor usage model" into cw-e-dev
* commit '5eccf896a838c74f844af5dc3e4e3584d3aff708':
  Fix sensor usage model
2015-09-26 06:54:52 +00:00
Ned Burns
99fa24ff71 am 11b87b91: am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '11b87b9109717b30729e2ce01ac5014ba91c1051':
  Kill ActivityView's background thread when it's destroyed
2015-09-26 06:54:22 +00:00
Bryce Lee
861559d31f am 24e5efda: Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev
* commit '24e5efda0509871d2a7a779739cce5264de68459':
  Add additional broadcast for when a phone account is unregistered.
2015-09-26 02:48:18 +00:00
Bryce Lee
24e5efda05 Merge "Add additional broadcast for when a phone account is unregistered." into cw-e-dev 2015-09-26 02:41:50 +00:00
Bryce Lee
6ad696c35b am f0740e0a: Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev
* commit 'f0740e0a2e51d2cb9b6e9ea7fbd251bfa9b2a0ad':
  Add ThermalObserver system service to capture thermal state uevents.
2015-09-26 01:41:22 +00:00
Bryce Lee
f0740e0a2e Merge "Add ThermalObserver system service to capture thermal state uevents." into cw-e-dev 2015-09-26 01:33:00 +00:00
Bryce Lee
bc58f59da6 Add ThermalObserver system service to capture thermal state uevents.
Bug: 21445745
Change-Id: I980d60b66ca51942a1fd62502d6cf1f09208fc3a
2015-09-25 16:43:01 -07:00
Adrian Roos
47a497cf53 am 1a6f9216: am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '1a6f9216f49f6392d33fc30cee7e1ccbca93c081':
  Show charging speed when time to full is available
2015-09-25 23:36:15 +00:00
Adrian Roos
1a6f9216f4 am 896b9c62: Merge "Show charging speed when time to full is available" into mnc-dr-dev
* commit '896b9c6261641e285bc37c4d22a589b01ce11ffe':
  Show charging speed when time to full is available
2015-09-25 23:27:59 +00:00
Adrian Roos
896b9c6261 Merge "Show charging speed when time to full is available" into mnc-dr-dev 2015-09-25 23:23:26 +00:00
Todd Kennedy
8c6e537225 Allow using the JIT
Instead of the JIT only being available for eng builds [or configurable
via environment variable], allow the JIT to be enabled programatically.

Change-Id: Ifcbc8445fb8bd45ce2bfed3f80fbaf48496f8e3a
2015-09-25 16:18:47 -07:00
Adrian Roos
7e39e59f37 Show charging speed when time to full is available
Only shows if translation is available, follow-up
I3e883eeca002e86d4df30c2b238e18bd63bbddea to show in
all locales.

Bug: 24167496
Change-Id: I667cde69e5d5f8aec8ac9fd105bbfb7e118ced64
2015-09-25 15:22:32 -07:00
Todd Kennedy
389bb7f509 am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
  Pass dexopt flags as integer
2015-09-25 22:17:06 +00:00
Todd Kennedy
9f86026444 resolved conflicts for 7de7e0b0 to stage-aosp-master
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-09-25 15:06:49 -07:00
Nick Vaccaro
5eccf896a8 am faf3f370: Merge "Fix sensor usage model" into cw-e-dev
* commit 'faf3f3706140c3b90c805e77c3c72c0978b0d61a':
  Fix sensor usage model
2015-09-25 21:44:26 +00:00
Todd Kennedy
7de7e0b0dd Merge "Pass dexopt flags as integer" 2015-09-25 21:41:39 +00:00
Nick Vaccaro
faf3f37061 Merge "Fix sensor usage model" into cw-e-dev 2015-09-25 21:36:14 +00:00
Ned Burns
11b87b9109 am 1b69fcbf: am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit '1b69fcbf810a805a0fa3dbfc6a3d7cc49d87f33e':
  Kill ActivityView's background thread when it's destroyed
2015-09-25 21:20:08 +00:00
Ned Burns
1b69fcbf81 am f4e1d10c: Kill ActivityView\'s background thread when it\'s destroyed
* commit 'f4e1d10cd35a4c1f87ec6dc3e59a9d08e562ffca':
  Kill ActivityView's background thread when it's destroyed
2015-09-25 21:10:09 +00:00
Dan Willemsen
81944da434 Add exported include dir for libandroid_runtime
The libnativehelper global include dir is being removed.

Bug: 18903857
Change-Id: I6f1bed76372ccedbe7feb4d215ba8c1c0fc0a87f
2015-09-25 14:08:45 -07:00
Todd Kennedy
fa54ab7950 Pass dexopt flags as integer
Instead of using a series of booleans, create a single flags integer
that contains all of the dexopt options.

Change-Id: Ia8fa968f64b164267f43dd29cea9dc0413058125
2015-09-25 13:52:33 -07:00
Nick Vaccaro
20feaea1aa Fix sensor usage model
Changed to use the correct API based on the reporting type of the
chosen sensor.  The code was incorrectly treating the WRIST TILT
sensor as a one-shot sensor instead of a special-reporting sensor.

Bug: 11661021
Change-Id: Ib8b7ef5bad9642773f4c0e22e218fbec8c34439b
2015-09-25 13:21:46 -07:00
Jae Seo
57551c2896 docs: fix a wrong link
Change-Id: Ib60dfb5a4c9ac8138a357af492f55ca27a7466f6
2015-09-25 12:50:08 -07:00
Gus Prevas
3197cd36fe am 41110261: am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
* commit '41110261bb4f9f733b579b3dc26d3d6de5642ef5':
  Adds an option to override RemoteViews transition.
2015-09-25 18:09:41 +00:00
Ian Pedowitz
cafb3192a0 am 4c74a02e: am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
* commit '4c74a02eea04c5faa541812607a5782505bacf00':
  Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 18:09:35 +00:00
Joe LaPenna
84270fb60a am 5d05db28: (-s ours) am ac342d38: (-s ours) Merge "Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE" into cw-e-dev
* commit '5d05db28773dc0b242d8f894abd65f6b3c2a17c4':
  Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE
2015-09-25 18:09:16 +00:00