209126 Commits

Author SHA1 Message Date
George Mount
c0231f26fe am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit 'a29cfefe2c157a28b256771b1dce4653d405dcf1':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 14:49:11 +00:00
Geoff Mendal
4e3f444adf am 924319c2: (-s ours) am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '924319c2e5bd09a95685ef10bb2eb8b15ad07e58':
  Import translations. DO NOT MERGE
2015-07-27 14:42:45 +00:00
George Mount
c571a9a1d0 am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs
* commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065':
  Update data binding for RC1.
2015-07-27 14:35:50 +00:00
George Mount
a29cfefe2c am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs
* commit '95e6ae3ad1ba8647494f0b5007b7beee76493e03':
  DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
2015-07-27 14:35:45 +00:00
Geoff Mendal
924319c2e5 am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '855184113cfd367c7b4d5700bf342ad9141e988e':
  Import translations. DO NOT MERGE
2015-07-27 14:29:09 +00:00
George Mount
6397ae6a0a Merge "Update data binding for RC1." into mnc-preview-docs 2015-07-27 14:24:34 +00:00
George Mount
95e6ae3ad1 Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs 2015-07-27 14:24:17 +00:00
Chris Wren
38910d18e0 am 9fca530e: am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '9fca530e3f4491efb5945a2eae44d0899710410b':
  decide interruptions based on current data, not previous data.
2015-07-27 14:15:32 +00:00
Chris Wren
87a28758c1 am a3a53c6b: am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit 'a3a53c6b409ada4aba84ffe25c2d6e891ec47a37':
  add ticker to enqueue message for easier debugging
2015-07-27 14:15:25 +00:00
Geoff Mendal
855184113c am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '3a5edd9f183789090b657ab92db1425e74082fa6':
  Import translations. DO NOT MERGE
2015-07-27 14:14:27 +00:00
Chris Wren
9fca530e3f am 7339ed18: am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '7339ed18978ae640a8ac053053459e1ef8c6bc8d':
  decide interruptions based on current data, not previous data.
2015-07-27 14:02:27 +00:00
Chris Wren
a3a53c6b40 am 447009e3: am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '447009e3b014e8e9cc591c448064493ca22352f9':
  add ticker to enqueue message for easier debugging
2015-07-27 14:02:22 +00:00
Geoff Mendal
3a5edd9f18 am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4cd6da535a0b9a5938164edaa1a482a3c9f1ddf6':
  Import translations. DO NOT MERGE
2015-07-27 14:02:12 +00:00
Derek Sollenberger
6cead94206 Merge "Change from SkDeviceProperties to SkSurfaceProps." 2015-07-27 13:51:32 +00:00
Derek Sollenberger
457672d5f0 Merge "switch to new signature for NewWithProc" 2015-07-27 13:51:32 +00:00
Geoff Mendal
4cd6da535a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-27 13:48:16 +00:00
Chris Wren
7339ed1897 am 5f181efd: am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '5f181efd820c0554a071dd57b027ca35aa5b974f':
  decide interruptions based on current data, not previous data.
2015-07-27 13:48:16 +00:00
Chris Wren
447009e3b0 am eae9d6da: am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit 'eae9d6dae32ac01ac2ba0959eef0858a8c919c19':
  add ticker to enqueue message for easier debugging
2015-07-27 13:48:09 +00:00
Geoff Mendal
10df6d4ccb Import translations. DO NOT MERGE
Change-Id: I0805cc2f593746482579e1e8111f26ecd451173b
Auto-generated-cl: translation import
2015-07-27 06:44:06 -07:00
Chris Wren
5f181efd82 am fdc283e9: am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit 'fdc283e9231ad6f396441ccf4b50f46d151b28eb':
  decide interruptions based on current data, not previous data.
2015-07-27 13:35:51 +00:00
Chris Wren
eae9d6dae3 am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '3dad6c661f76b69475bb38b950d74f5de3bb8a8f':
  add ticker to enqueue message for easier debugging
2015-07-27 13:35:47 +00:00
Chris Wren
fdc283e923 am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev
* commit '11f4cb1bccf47a0e985be6948f30709ba40f4522':
  decide interruptions based on current data, not previous data.
2015-07-27 13:21:39 +00:00
Chris Wren
3dad6c661f am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev
* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging
2015-07-27 13:21:35 +00:00
Chris Wren
11f4cb1bcc Merge "decide interruptions based on current data, not previous data." into mnc-dev 2015-07-27 13:10:11 +00:00
Chris Wren
45a0bb18fe Merge "add ticker to enqueue message for easier debugging" into mnc-dev 2015-07-27 13:09:15 +00:00
Geoff Mendal
7e99dd0dbf Import translations. DO NOT MERGE
Change-Id: Ice9b2e3e8808f8fd6e96dd564706692e89e26394
Auto-generated-cl: translation import
2015-07-27 05:45:24 -07:00
Daichi Hirono
2e6eb521bc Merge "Implement openDevice/closeDevice method of MtpManager." 2015-07-27 07:01:49 +00:00
Daichi Hirono
675032330f Merge "Add openDevice and closeDevice methods to MtpDocumentsProvider." 2015-07-27 07:00:56 +00:00
Erik Kline
b1ca5ed701 am 05cf335f: am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '05cf335fc4e9cd50ddac809a47bb59ca459cc67e':
  Change to connectivitycheck.gstatic.com
2015-07-27 06:09:09 +00:00
Erik Kline
05cf335fc4 am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '04159d0b8ea468947cdb349be007f99ba25baa92':
  Change to connectivitycheck.gstatic.com
2015-07-27 05:59:10 +00:00
Erik Kline
04159d0b8e am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit 'f0927733a31a95d88c32d2e41f40f1873361856b':
  Change to connectivitycheck.gstatic.com
2015-07-27 05:40:12 +00:00
Erik Kline
f0927733a3 am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit '8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
  Change to connectivitycheck.gstatic.com
2015-07-27 05:23:23 +00:00
Erik Kline
8c54a8e8c7 am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev
* commit 'a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
  Change to connectivitycheck.gstatic.com
2015-07-27 04:32:19 +00:00
Erik Kline
a7bdace262 Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 2015-07-27 02:35:09 +00:00
Nick Kralevich
73612fbbc9 am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"
* commit 'e942b4596a12685cb722ddef4e59e279e6fd513f':
  ActivityManagerService: delete unnecessary mkdir
2015-07-26 04:39:19 +00:00
Nick Kralevich
e942b4596a Merge "ActivityManagerService: delete unnecessary mkdir" 2015-07-26 04:25:56 +00:00
Nick Kralevich
bd6b7e0973 ActivityManagerService: delete unnecessary mkdir
/data/anr is now created in init.rc. This code is unnecessary.

Bug: 22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d
2015-07-25 21:17:43 -07:00
Svet Ganov
f12b393ff4 Pass correct extras to the custom print options activity
bug:22734138

Change-Id: Iea1bc32c3e863072b2021b823bef2cefa54fa540
2015-07-25 12:11:01 -07:00
Jeff Sharkey
a0d9a63f1d Follow refactoring when enforcing permissions.
Change-Id: I3fd245622a7f1183cbe21e61f7604c8195022e69
2015-07-25 10:40:27 -07:00
Geoff Mendal
5893c2091a am 87431eea: (-s ours) am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '87431eeac9c72854ff56727100ff3882ffdca3ce':
  Import translations. DO NOT MERGE
2015-07-25 16:48:28 +00:00
Geoff Mendal
87876e31e6 am aec2c787: (-s ours) am fab538f9: (-s ours) am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translations. DO NOT MERGE
* commit 'aec2c787a5234327377cb8f07cbee9407f13b52e':
  Import translations. DO NOT MERGE
2015-07-25 16:48:22 +00:00
Jeff Sharkey
f3230a7e69 am 43b379e7: am 43ff3afe: am 4c864be1: am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev
* commit '43b379e72be58fca50af64092f5c99463d76d65b':
  Also check app-ops on path-permissions.
2015-07-25 16:48:14 +00:00
Selim Cinek
551a063fc3 am a69f8531: am fd89d2a0: am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
* commit 'a69f8531185e0238d173c574bc7e10c43a8a9d0a':
  Fixed wake to unlock when the device has never been unlocked
2015-07-25 16:48:06 +00:00
Jorim Jaggi
d6e7bab0e8 am 9fd390c6: am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display
* commit '9fd390c6b998eea2795a20ef0ff9f88018e03a4f':
  Fix ambient display
2015-07-25 16:47:58 +00:00
Adam Lesinski
2765d57153 am 6593daa3: am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
* commit '6593daa39eaf71785cdf68f3899b69f8f6010046':
  BatteryStats: Decode wakeup reasons in Java
2015-07-25 16:47:49 +00:00
Selim Cinek
da2ac5770b am 25fcf199: am e756d912: am d2e40fab: am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev
* commit '25fcf1994c24954d34608ade2ee8fb2212e5e9d1':
  Adapted the behavior when unlocking with fingerprint is not allowed
2015-07-25 16:47:40 +00:00
Chris Banes
f151854176 am 0e23c2b7: am 6331c6ca: am a62f3ee8: am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs
* commit '0e23c2b7da91549546de2c8d14f5f49cd0312781':
  v22.2.1 support api diff
2015-07-25 16:47:32 +00:00
Adrian Roos
0a762d225c am c39e2a76: am 68db46ff: am 4fd4f4b4: am 047b2bfd: am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit 'c39e2a76d9bcb6baac7587988f4d7aa8d6bd603f':
  Prevent insanely long passwords from crashing SystemUI
2015-07-25 16:47:21 +00:00
John Reck
e92c622650 am 2a548609: am f43f6c5a: am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev
* commit '2a5486090f06e7caaf7dec3e885bbc2a48a877da':
  Use process state to filter >= UI_HIDDEN
2015-07-25 16:47:12 +00:00
Geoff Mendal
87431eeac9 am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '08f5cd338566d5bab06003eadf29156bd6367690':
  Import translations. DO NOT MERGE
2015-07-25 16:36:58 +00:00