Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
12fff1c00f docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 am: 05710bf9e3 
am: a671603628

* commit 'a671603628b4003462d9bb9ff67b1e88590c47e1':
  docs: Minor permissions phrasing tweak

Change-Id: If299098d74088a95026e88fc42d6cab3215f96f3
 2016-05-16 21:51:40 +00:00
Julia Reynolds
a2e735897b Merge "Adjust spacing." into nyc-dev am: 45626c448d 
am: 4293b96872

* commit '4293b9687299fda1a1ae4ba6ffc3cda7c817a1a5':
  Adjust spacing.

Change-Id: Id1dd33f9bbe861078038f798b86af512072addc7
 2016-05-16 21:51:37 +00:00
Jorim Jaggi
840165f0bf Don\'t throw away wallpaper bitmap just because we are hidden. 
am: ed0e1a68a4

* commit 'ed0e1a68a437979e399724ca17f422add80bd0e4':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: Id1af47665ea63354c6f6e6f8f01761b7c917d2ad
 2016-05-16 21:51:23 +00:00
Julia Reynolds
0e2755e7c1 Merge "Adjust spacing." into nyc-dev am: 45626c448d 
am: 197ab4d5dc

* commit '197ab4d5dc0a074ebd1543b08b56843a9f16c6ed':
  Adjust spacing.

Change-Id: I9d4b1ad0282a462e701039f6525bdbb6bef1f1ed
 2016-05-16 21:50:05 +00:00
Philip P. Moltmann
11e215bc45 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 2016-05-16 21:43:13 +00:00
Julia Reynolds
197ab4d5dc Merge "Adjust spacing." into nyc-dev 
am: 45626c448d

* commit '45626c448d63b7a3c0e86d7b03043271f7fa68af':
  Adjust spacing.

Change-Id: I9368d77b3d6d630d53a8a9beb6f5d20665268930
 2016-05-16 21:41:52 +00:00
Julia Reynolds
4293b96872 Merge "Adjust spacing." into nyc-dev 
am: 45626c448d

* commit '45626c448d63b7a3c0e86d7b03043271f7fa68af':
  Adjust spacing.

Change-Id: Id73f60aa292581048add8c40b0a580b57ea653bd
 2016-05-16 21:41:46 +00:00
Andrew Solovay
2b602765a8 Merge "Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 am: 232d2f8fc7" into nyc-mr1-dev-plus-aosp 
am: 430b82217a

* commit '430b82217a8b8e1a3f50ea6a5ceec883775f771f':

Change-Id: I5dde7232b4f482cdf676460c875ffbca2aafc854
 2016-05-16 21:39:43 +00:00
Vladislav Kaznacheev
764b43444b Merge "Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 4695fae868" into nyc-mr1-dev-plus-aosp 
am: a97ff704e5

* commit 'a97ff704e56ccd70f169f01a6ad639d4e2064afa':

Change-Id: Iffbc535f4e058bc29d97884240c6eab4cfa0e5f8
 2016-05-16 21:39:36 +00:00
Andrew Solovay
b31e5363ed Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 am: d25e86bef0 
am: 3195a6a098

* commit '3195a6a098cd922248b069241cbb8867c284dd2e':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I0f0101ee43468635a1b0a8b92f489b0954f7c110
 2016-05-16 21:39:29 +00:00
Vladislav Kaznacheev
f0c3721ac1 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 943c9f10d2 
am: a19f5b640c

* commit 'a19f5b640c3713485c8813cb33f9a0f50d45a79c':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I5c964791ed64ff67dbc35dea23e40bd5b8801d03
 2016-05-16 21:39:19 +00:00
Andrew Solovay
ba0d5b0f57 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 
am: a1a224fa83

* commit 'a1a224fa83e70c2fdc3e602d5ef084e013af0164':

Change-Id: I399dc584f93489dd6395441e860e4d89ff50172f
 2016-05-16 21:39:18 +00:00
Sanket Padawe
9c0e9ee105 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca am: fc848e9c2b 
am: 0eed46b0d0

* commit '0eed46b0d0fa2369844ae2a35c94c4e7a7493a0e':

Change-Id: I0f12f1748837039b7d141b6d5acd02e020e05a92
 2016-05-16 21:39:07 +00:00
Anthony Hugh
d216ac3da3 Change Priority Only mode defaults on watches 
Changes Priority Only mode defaults on watches to the following:
Allow starred contacts to go through only. Repeated calls on.
Calls, messages, reminders, events off

BUG: 28640779
Change-Id: I89d57de58a8c3bb62432f97e96b60c653745d303
 2016-05-16 14:38:59 -07:00
Jorim Jaggi
ed0e1a68a4 Don't throw away wallpaper bitmap just because we are hidden. 
TRIM_MEMORY_UI_HIDDEN > TRIM_MEMORY_RUNNING constants, so we only
need to throw away the wallpaper if we are actually running low on
memory.

Bug: 28769940
Change-Id: I8aa27d081bbcc2eff553e9420b2b9b0920f3781f
 2016-05-16 21:37:59 +00:00
Andrew Solovay
a671603628 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 
am: 05710bf9e3

* commit '05710bf9e30ebdbb9c82006afc5cb275073ac45a':
  docs: Minor permissions phrasing tweak

Change-Id: I01dfc20cc305662ba205eeb99ca2887ab643c25c
 2016-05-16 21:35:00 +00:00
Julia Reynolds
45626c448d Merge "Adjust spacing." into nyc-dev 2016-05-16 21:34:15 +00:00
Android Build Merger (Role)
430b82217a Merge "Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 am: 232d2f8fc7" into nyc-mr1-dev-plus-aosp 2016-05-16 21:33:06 +00:00
Android Build Merger (Role)
a97ff704e5 Merge "Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 4695fae868" into nyc-mr1-dev-plus-aosp 2016-05-16 21:32:44 +00:00
Sanket Padawe
76135377d4 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca am: 2bd42d8224 
am: 8259fd31c7

* commit '8259fd31c76182ab3e759a5180caddfaa6f3edcf':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: Ib0c6597007522c7d97d3eedef426badf30e86017
 2016-05-16 21:32:20 +00:00
Andrew Solovay
f21e0ba082 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 
am: 232d2f8fc7

* commit '232d2f8fc788198487853c4bd2b3ae324ad8cbe5':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I599ea6a44b791826eff797241d7ef9d71d79c988
 2016-05-16 21:32:19 +00:00
Vladislav Kaznacheev
686b021f81 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac 
am: 4695fae868

* commit '4695fae86896d5f452d95196120bb4948f11803a':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: If53ca21962eab18e3a0b97d1b9402a1294f472dc
 2016-05-16 21:32:13 +00:00
Andrew Solovay
3195a6a098 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 
am: d25e86bef0

* commit 'd25e86bef075a0537ec7c3355a466ce1c28bbefe':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Ia8e2256af3502888c547cdd82bbdfc222d73ab8f
 2016-05-16 21:31:14 +00:00
Vladislav Kaznacheev
a19f5b640c Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac 
am: 943c9f10d2

* commit '943c9f10d284acf5a5f927517fc7c283c473382e':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I6a35f83dcc11704dfbc983bd9004685ecc63b9b5
 2016-05-16 21:31:10 +00:00
Andrew Solovay
05710bf9e3 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff 
am: 3228255e77

* commit '3228255e772e026da7d00cb914e76e454830328d':
  docs: Minor permissions phrasing tweak

Change-Id: I5cfb4898f976a34fb4b88c19238c13853f8231c8
 2016-05-16 21:31:06 +00:00
Sanket Padawe
0eed46b0d0 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca 
am: fc848e9c2b

* commit 'fc848e9c2bcab9878cdae3f6458529f42768e873':

Change-Id: Ieb18c5f3aa978e477528463d5c28ffcfb9756045
 2016-05-16 21:31:05 +00:00
Andrew Solovay
a1a224fa83 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff 
am: 3228255e77

* commit '3228255e772e026da7d00cb914e76e454830328d':
  docs: Minor permissions phrasing tweak

Change-Id: Iaa59ba0131a79a17d408d0a42ef15a190b0d972c
 2016-05-16 21:30:54 +00:00
Andrew Solovay
232d2f8fc7 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 
am: a586b078b3

* commit 'a586b078b356b4a2da6b2d9b1135c6a41b85703e':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I1e90ff314935950c751b1f42f637806f01054e8f
 2016-05-16 21:26:12 +00:00
Vladislav Kaznacheev
4695fae868 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I5d87956bf0fe48acf66d577d8531e2669ec5b001
 2016-05-16 21:26:09 +00:00
Andrew Solovay
d25e86bef0 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 
am: a586b078b3

* commit 'a586b078b356b4a2da6b2d9b1135c6a41b85703e':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I4cb72280c61fcdcb23f39f1875b575d05ea2cc90
 2016-05-16 21:26:09 +00:00
Andrew Solovay
3228255e77 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 
am: 8804495bff

* commit '8804495bffbbffa0abe8cd148ba1ea3c58e20be0':
  docs: Minor permissions phrasing tweak

Change-Id: I348ecb4cbe9301eccd78c6e2f87b1eb016627d5d
 2016-05-16 21:26:07 +00:00
Sanket Padawe
8259fd31c7 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca 
am: 2bd42d8224

* commit '2bd42d82243c90b051a449cdcb7fb3766b5d3a83':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I23c27cd49972b658d00fb0f5dd9d466094ce4179
 2016-05-16 21:26:04 +00:00
Vladislav Kaznacheev
943c9f10d2 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I8b704c0cf3b4df430b0f5a322e1cee008e67d113
 2016-05-16 21:26:04 +00:00
Android Build Merger (Role)
a586b078b3 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 2016-05-16 21:23:22 +00:00
Sanket Padawe
fc848e9c2b Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 
am: 8c60dbe3ca

* commit '8c60dbe3caae6bdfc202f17455526cb16cd46439':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I65ce85fd9134594c9db88252b268eaba93cdcb4d
 2016-05-16 21:23:04 +00:00
Andrew Solovay
d65f0c9eed docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b 
am: be2b224d80

* commit 'be2b224d80554906aa03c57f6096fa51afb48fdf':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Ic6ffde061f37bd74e45a3f60de8a5bb6aa241c58
 2016-05-16 21:22:55 +00:00
Sanket Padawe
2bd42d8224 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 
am: 8c60dbe3ca

* commit '8c60dbe3caae6bdfc202f17455526cb16cd46439':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I737738186f863b6fdbb034c878a964f54d7b0369
 2016-05-16 21:22:19 +00:00
TreeHugger Robot
a423ec52ac Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 2016-05-16 21:21:58 +00:00
Jorim Jaggi
1e630c0829 Fix transition delay tracking when starting activity from recents 
- Move logic to determine app switch etc. into ActivityMetricsLogger.
- Make sure the notify the tracker in startActivityFromRecentsInner

Bug: 27295491
Change-Id: Ic68058c88917e3f37183dded2f13cb35055323ee
 2016-05-16 21:18:04 +00:00
Andrew Solovay
8804495bff docs: Minor permissions phrasing tweak am: 9acd851ee6 
am: 072b6fb839

* commit '072b6fb83928120de268a1e59ebabb7f2a5c724a':
  docs: Minor permissions phrasing tweak

Change-Id: I90d66b9c745bb6f313a074c9d4b4c94a8319dbc3
 2016-05-16 21:16:06 +00:00
TreeHugger Robot
4d623b1815 Merge "sysui: refactor for extension." 2016-05-16 21:13:54 +00:00
Andrew Solovay
072b6fb839 docs: Minor permissions phrasing tweak 
am: 9acd851ee6

* commit '9acd851ee6071fa82a725a69d75c59bf4068a83a':
  docs: Minor permissions phrasing tweak

Change-Id: I823cc460ffbf71fce9013967046076f937af3168
 2016-05-16 21:13:13 +00:00
TreeHugger Robot
8c60dbe3ca Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 2016-05-16 21:13:05 +00:00
Andrew Solovay
be2b224d80 docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 
am: af9dc9292b

* commit 'af9dc9292b552e189c43596658b0f09b052493af':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Id5866a8ce27407924508703292a223a4f0399cb3
 2016-05-16 21:11:04 +00:00
Andrew Solovay
af9dc9292b docs: Removed note that GET_ACCOUNTS was deprecated 
am: cc80393d94

* commit 'cc80393d94e53bc92f70e2d306ad87a92ff83794':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Icc2579926a473f72236837fb94a68fbf16494478
 2016-05-16 21:08:05 +00:00
Andrew Solovay
9acd851ee6 docs: Minor permissions phrasing tweak 
Meant to make this change in a preceding CL but accidentally
submitted before uploading the last patch set.

bug: 28727522
Change-Id: Iecf2e00031d98efbb2a8e2bf0e9386ac8707b48b
 2016-05-16 14:06:19 -07:00
Android Build Merger (Role)
9728c7a7b0 Merge "Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev am: ca2da6dc33 am: 655041ef5a -s ours" 2016-05-16 20:59:41 +00:00
Ta-wei Yen
07f4abd8ed Merge "Add visual voicemail SMS filter APIs" into nyc-mr1-dev am: ca2da6dc33 
am: 655041ef5a  -s ours

* commit '655041ef5acbaf1f04ee0ca37391bafda535e2da':
  Add visual voicemail SMS filter APIs

Change-Id: Ie72fe1bd3aa24433dfbdd176af9c80407a2a24b5
 2016-05-16 20:59:19 +00:00
Rebecca Silberstein
316f8ce128 Merge "StateMachine: remove final from SendMessage" 2016-05-16 20:58:43 +00:00
Felipe Leme
c9c7be58a5 Documented return value of getRestrictBackgroundStatus(). 
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
 2016-05-16 13:57:19 -07:00