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
Brian Carlstrom
f83612b295
Add support for --user to "pm path" for work profile use
...
Change-Id: Ic8bb923e15a40f32cc7daa6a344250abfc81e423
2015-09-25 13:08:35 -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
Jorim Jaggi
569af4e9f8
am 1727a8e0: am 31519f63: am ea9675e7: Merge "Do not issue config change command when not needed" into mnc-dr-dev
...
* commit '1727a8e0ea3334efd7ce07d7b7a0130e1f485f01':
Do not issue config change command when not needed
2015-09-25 18:09:07 +00:00
Pankaj Kanwar
1e595bc225
am 52762ce8: am f99986ee: am 65bfe1ca: Merge "AudioService: cleanup sco audio mode upon disconnection." into mnc-dr-dev
...
* commit '52762ce874200ad2fdbe24fa83ebf8ef6cbf08a4':
AudioService: cleanup sco audio mode upon disconnection.
2015-09-25 18:08:59 +00:00
Baligh Uddin
252044e5e0
am 8403b9b7: (-s ours) am 437ee52a: (-s ours) am 2f09d2a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '8403b9b7262527a27c7f77901ba4bb7d52a5c301':
Import translations. DO NOT MERGE
2015-09-25 18:08:32 +00:00
Baligh Uddin
e8b72edb18
am b4f7abbd: (-s ours) am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'b4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c':
Import translations. DO NOT MERGE
2015-09-25 18:08:26 +00:00
Baligh Uddin
58bed419ad
am c266a512: (-s ours) am 6a39ee4d: (-s ours) am 9db221c8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'c266a512cc4d4d844d152ad0ea8086966ee26dc9':
Import translations. DO NOT MERGE
2015-09-25 18:08:20 +00:00
Baligh Uddin
2b3f2f4509
am fdfd01be: (-s ours) am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'fdfd01bef34ada326ff502f327e4387b8b14aa81':
Import translations. DO NOT MERGE
2015-09-25 18:08:14 +00:00
Jorim Jaggi
c594e9354a
am f9f9999d: am b7b9b31f: am ad26dc5f: Merge "Deliver camera launch source for analytics" into mnc-dr-dev
...
* commit 'f9f9999d3245dffc8463a1f3f5f74dc900aa0196':
Deliver camera launch source for analytics
2015-09-25 18:07:52 +00:00
Michael Lentine
561f697e4b
am a86465d7: am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev
...
* commit 'a86465d7af8c8995210166954ec42624560bf86e':
Revert "Dismiss color fade when it is no longer used."
2015-09-25 18:07:41 +00:00
Jeff Sharkey
307d424467
Clean stale entries when deleting files.
...
When deleting files directly from external storage devices, remove
any matching entries from MediaStore so we don't end up showing
stale entries to clients, such as MTP/PTP.
Also handles the case where an entire directory is deleted.
Bug: 24045921
Change-Id: I802470fa1aa03e0bec147ea113f1a49e26a0f3f9
2015-09-25 10:30:07 -07:00
Gus Prevas
41110261bb
am b17d1e5e: Merge "Adds an option to override RemoteViews transition." into cw-e-dev
...
* commit 'b17d1e5e6aa53f5925efc2135b9a603a9a0ed2df':
Adds an option to override RemoteViews transition.
2015-09-25 17:24:39 +00:00
Gus Prevas
b17d1e5e6a
Merge "Adds an option to override RemoteViews transition." into cw-e-dev
2015-09-25 17:17:44 +00:00
Ian Pedowitz
4c74a02eea
am 3af6163a: am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
...
* commit '3af6163a66dceb7a6e6e300f5f8de828c88919d4':
Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 17:17:25 +00:00
Gus Prevas
1ed322b123
Adds an option to override RemoteViews transition.
...
This change adds a configuration option,
"config_overrideRemoteViewsActivityTransition", which is false by
default and true on watches. If it's true, when a RemoteViews
is clicked, it will use a new attribute on the active window animation
style, "activityOpenRemoteViewsEnterAnimation", to determine
the entry transition to use, instead of the current hard-coded
default.
Bug: 23534750
Change-Id: I91e92804a663ab71a3e46c3430fa579b87cc7931
2015-09-25 13:10:52 -04:00
Ian Pedowitz
3af6163a66
am 31fe464d: Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
...
* commit '31fe464d50bcd4360ac004d44d6938eac762d78d':
Give the DhcpClient alarm broadcasts foreground priority.
2015-09-25 17:10:33 +00:00