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
Robin Lee
d171df660e Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Selim Cinek
5b03ce95c7 Fixed a bug where autobundling could lead to bugs 
Notifications could appear twice if a notification with an app
group became bundled and one could not be swiped away anymore.
This is because we were unconditionally copying over the override
key even if the notification just became a group.

This also fixes a nullpointer that could happen with a racecondition
when a notification was cancelled and it tried to be used for autobundling.

This also fixes an issue that the autobundling wasn't working correctly
when a notification didn't have a group set but was set to be a
group summary.

Change-Id: Icd971f16ae0804ce162fd3171fcdd99bd04f3885
Fixes: 28706404
Fixes: 28628237
 2016-05-18 16:31:41 -07:00
Miao Wang
c242fa6b5d [RenderScript] Fix ScriptIntrinsicBlur documentation. 
Bug: 28177406
Change-Id: Icccf35857cf29f827a78704e7751c8791cda0d7b
 2016-05-18 16:28:55 -07:00
Miao Wang
3231e8e022 Update documentation about copyTo and copyFrom. 
Bug: 23159764
Bug: 26862970

  - Add detailed description of AutoPadding
  - Add comments to all the copy related APIs.
  - Fix typos in the comments.

Change-Id: I2d045e0d90efd94f1407f88d3e35bcd42ea93fb9
 2016-05-18 16:28:47 -07:00
Robin Lee
17e6183b85 Lock down networking when waiting for always-on 
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
 2016-05-19 00:26:53 +01:00
Sunny Goyal
64148406d1 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev am: d2d8e9b228 
am: fcdbde4caa

* commit 'fcdbde4caa547087d82830647517c411e216626f':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: Ia4cd711147fa865a18177f98b792181d71c71acd
 2016-05-18 23:24:36 +00:00
Sunny Goyal
fcdbde4caa Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 
am: d2d8e9b228

* commit 'd2d8e9b22830a07d12f1542a5dc9476a3ab3d7bb':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: I04ca85225233f4165c3c9cd1ab56d9c772b7d7c1
 2016-05-18 23:20:43 +00:00
smain@google.com
4fb0d93478 Merge "update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e am: b003918128" into nyc-mr1-dev-plus-aosp 
am: 69ead35abd

* commit '69ead35abd237af3ae41973f35e3faae5877c756':

Change-Id: Ib37111287dff2b810464339c9ce5917fea0f1d32
 2016-05-18 23:14:49 +00:00
smain@google.com
09eaaeedce Merge "update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e am: 8034ff14ed" into nyc-mr1-dev-plus-aosp 
am: 94b887d9cc

* commit '94b887d9cc79b87d8b8b9e098f91402070deb402':
  update sdk/ link to studio/

Change-Id: Ibec031c0f7d6e62e2639065eccc6c934b3fef7ab
 2016-05-18 23:14:42 +00:00
Bert McMeen
4a8b25d641 Merge "Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 am: 663bac1fd1" into nyc-mr1-dev-plus-aosp 
am: f113e303c5

* commit 'f113e303c589d7f49c300487985cf25f9d76e384':

Change-Id: I41a955f09ddd4298088e7eca36d6575d9f714c5b
 2016-05-18 23:14:33 +00:00
Bert McMeen
67c01883a4 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 am: 0cd72d746a 
am: 91bdfbf07d

* commit '91bdfbf07dfa34acd9c85f673f86157b81ed4451':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: Ie50d52ed12859abda896f89e1ff026f1b7a1966d
 2016-05-18 23:14:24 +00:00
Sunny Goyal
d2d8e9b228 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 2016-05-18 23:13:00 +00:00
Sunny Goyal
49e6695c5c Store the appropriate layout id for the infrated view, so that 
it can be used for verification during reapply.

Bug: 28815495
Change-Id: I8516661ef97f529851069331a6c2bb64429c7766
 2016-05-18 16:11:11 -07:00
Android Build Merger (Role)
69ead35abd Merge "update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e am: b003918128" into nyc-mr1-dev-plus-aosp 2016-05-18 23:07:54 +00:00
Android Build Merger (Role)
94b887d9cc Merge "update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e am: 8034ff14ed" into nyc-mr1-dev-plus-aosp 2016-05-18 23:07:50 +00:00
Android Build Merger (Role)
f113e303c5 Merge "Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 am: 663bac1fd1" into nyc-mr1-dev-plus-aosp 2016-05-18 23:07:42 +00:00
smain@google.com
29d5eb66ee update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e 
am: b003918128

* commit 'b003918128ab3f723c9a3cd8a71dfcc8c28d5a3a':
  update sdk/ link to studio/

Change-Id: Ic84499ec42d17517963309f66fe9c107085c0324
 2016-05-18 23:07:13 +00:00
smain@google.com
f821c54439 update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af am: ec82d3e76e 
am: 8034ff14ed

* commit '8034ff14edc289c32550096ac2701e1c2d1e4092':
  update sdk/ link to studio/

Change-Id: Ibf8d48da010e2353d92cd0af923844a3bf0ce154
 2016-05-18 23:07:10 +00:00
Bert McMeen
6e98c9e6ff Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 
am: 663bac1fd1

* commit '663bac1fd1104dd3b4bac7617509d5cbddcbc729':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I8aa3c1cb07c8a8e7f5c85ecb833f95dc4dce4fe2
 2016-05-18 23:07:08 +00:00
Bert McMeen
91bdfbf07d Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f am: c4e18f5a38 
am: 0cd72d746a

* commit '0cd72d746ad6cb368ae08e87ee18929aca02a829':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: Ice82e233d2293cecee267219e7122b162c32a28c
 2016-05-18 23:07:06 +00:00
Paul Crowley
6f754db1c4 Merge "Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 3ddb6d5fe2" into nyc-mr1-dev-plus-aosp 
am: 7dac5c55b3

* commit '7dac5c55b3d7f247f756bc43d8a783eabf691822':

Change-Id: Ica5cb5b0e994ac4b28b7d80c0d656074619f86f2
 2016-05-18 23:04:03 +00:00
smain@google.com
8034ff14ed update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af 
am: ec82d3e76e

* commit 'ec82d3e76e36b4e15835e7b48dff6aa7a861153e':
  update sdk/ link to studio/

Change-Id: Ieeeb96027ed86e5ac7270af79fad06d3b0a9d1b2
 2016-05-18 23:03:42 +00:00
smain@google.com
b003918128 update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d am: 9de1d192af 
am: ec82d3e76e

* commit 'ec82d3e76e36b4e15835e7b48dff6aa7a861153e':
  update sdk/ link to studio/

Change-Id: I29eb64e0d5e2f2d268506aa3cecf818a1a4b2d93
 2016-05-18 23:03:37 +00:00
Bert McMeen
0cd72d746a Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f 
am: c4e18f5a38

* commit 'c4e18f5a388a41da5ce3ee55a68d53d9254499c5':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I2b871710e8c527eea6205a09c15df72469d333f3
 2016-05-18 23:03:37 +00:00
Bert McMeen
663bac1fd1 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 am: 3fb62d859f 
am: c4e18f5a38

* commit 'c4e18f5a388a41da5ce3ee55a68d53d9254499c5':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I700d179e94b7a0c58fe647e169c3b178c5296bf1
 2016-05-18 23:03:33 +00:00
Paul Crowley
2970216a2b Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 2a1076339e 
am: 02826bb36b

* commit '02826bb36b023ba80b88ada743ac32b534a2c380':
  Two phases to set the password for disk encryption

Change-Id: Ib4dcc51963c1edc8410031a5dcb7c4eb0d876e16
 2016-05-18 22:59:54 +00:00
smain@google.com
ec82d3e76e update sdk/ link to studio/ am: 04de2d285e am: 2e28ebfc1d 
am: 9de1d192af

* commit '9de1d192af5761dec4e58837690febc6385874b4':
  update sdk/ link to studio/

Change-Id: I3184c8b697fe96162cb87c17bcf85fc6375127d9
 2016-05-18 22:59:45 +00:00
Bert McMeen
c4e18f5a38 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs am: 58fdf82ab9 
am: 3fb62d859f

* commit '3fb62d859f2c3ed0b06dd3d6f7183c838c829c2b':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I3ad08bb522e3c1ab2fefd2cf7884d69d82f5d394
 2016-05-18 22:59:36 +00:00
Android Build Merger (Role)
7dac5c55b3 Merge "Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb am: 3ddb6d5fe2" into nyc-mr1-dev-plus-aosp 2016-05-18 22:55:18 +00:00
Paul Crowley
47eb5a7d18 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb 
am: 3ddb6d5fe2

* commit '3ddb6d5fe2ef2c86a70af25ce79849e76efd5674':
  Two phases to set the password for disk encryption

Change-Id: Icc4ede9459833b3c8879514b15fd3b5aba9be812
 2016-05-18 22:54:54 +00:00
smain@google.com
9de1d192af update sdk/ link to studio/ am: 04de2d285e 
am: 2e28ebfc1d

* commit '2e28ebfc1d4ef357968923fc763d1f87ea389ef6':
  update sdk/ link to studio/

Change-Id: I2180d895901a935aa0ebf46cdbfc7b7ab8d2b23e
 2016-05-18 22:54:47 +00:00
Paul Crowley
02826bb36b Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb 
am: 2a1076339e

* commit '2a1076339ecb7ba9b7c8829bb3c3285df29a67e3':
  Two phases to set the password for disk encryption

Change-Id: I884dae66b133d8b9312a7793d415964e13ed8105
 2016-05-18 22:54:43 +00:00
Bert McMeen
3fb62d859f Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs 
am: 58fdf82ab9

* commit '58fdf82ab9c21fb6fd3d1d64e1d2c13abb670ba1':
  docs: Update to md5 and sha-1 values for Javadoc download

Change-Id: I0a158cce412a6973b607c2002a490ffa37e72f59
 2016-05-18 22:54:43 +00:00
Paul Crowley
3ddb6d5fe2 Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: Ieac13a4c2775e3d2bc5463f4161c6e8b151bf6c9
 2016-05-18 22:50:37 +00:00
smain@google.com
2e28ebfc1d update sdk/ link to studio/ 
am: 04de2d285e

* commit '04de2d285e6e264f5a7a84de205a30571fcc1c9e':
  update sdk/ link to studio/

Change-Id: I9fbf52b2802c4ae33bfef289c6fceb8484dd8014
 2016-05-18 22:50:05 +00:00
Paul Crowley
2a1076339e Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
 2016-05-18 22:50:02 +00:00
Andreas Gampe
a8a58ffdee Frameworks/base: Optimize LoadedApk 
Preallocate storage lists and avoid TextUtils and its string
builder for a common code path.

Optimize list join helper to not have a check in the loop.

Bug: 28801010
Change-Id: Iafc582031f973d718252b34bcda6405a77425628
 2016-05-18 15:48:12 -07:00
Bert McMeen
58fdf82ab9 Merge "docs: Update to md5 and sha-1 values for Javadoc download" into mnc-io-docs 2016-05-18 22:44:54 +00:00
Andreas Gampe
4c8e542f68 Frameworks/base: Add more systrace points 
Add more systrace points for application startup.

Bug: 28625993
Change-Id: I76dca9e842fb43f1b85981ef94582074d31528c8
 2016-05-18 15:43:45 -07:00
Paul Crowley
56a9395aeb Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-18 22:40:09 +00:00
TreeHugger Robot
68c92c7ca6 Merge "Added a getPrimaryStorageSize() method." 2016-05-18 22:35:26 +00:00
smain@google.com
43d47a1bc0 Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d am: d24ad86909 am: e1a486a4c1 
am: 643a9a79cf

* commit '643a9a79cfa2f65cf88c9fbb1ef46f335d943aea':

Change-Id: I15a1fa4ffd752ca3be6565e9346518b36b6da15e
 2016-05-18 22:32:41 +00:00
smain@google.com
04de2d285e update sdk/ link to studio/ 
Change-Id: I960fed90fc2c44d5c3405d330bc5a474ce9a13c5
 2016-05-18 15:28:59 -07:00
smain@google.com
643a9a79cf Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d am: d24ad86909 
am: e1a486a4c1

* commit 'e1a486a4c1fe3b32140cc69cb35a48d03368af21':

Change-Id: Ic421775e4bfb22f0b8adbf56dddbaded0276ab7d
 2016-05-18 22:23:40 +00:00
smain@google.com
e93b049126 Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d am: d24ad86909 am: 664446a34c 
am: 441247b832

* commit '441247b8322b136f534ca20029b1e4d2af2e9cb7':
  Update app context in code snippet bug: 28842396

Change-Id: I02f0ef1717bdd0597f63b30aa5b414673099582c
 2016-05-18 22:23:06 +00:00
smain@google.com
441247b832 Update app context in code snippet bug: 28842396 am: 056df25179 am: 0fc19538cf am: cca8eba82d am: d24ad86909 
am: 664446a34c

* commit '664446a34c1887c743060c8caa406a97923c483d':
  Update app context in code snippet bug: 28842396

Change-Id: Id6cb8c5d2da687dc4a75a1b401880d1ac03b05db
 2016-05-18 22:18:35 +00:00
Robert Carr
7b2f8502c8 Merge "Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: cd1a9642e8" into nyc-mr1-dev-plus-aosp 
am: 6ee6ba515a

* commit '6ee6ba515a2920345f871b3e06f79ae5e87790fb':

Change-Id: I88c26260241959101a8b0d58633c7dc7930fbc85
 2016-05-18 22:16:13 +00:00
Robert Carr
7de1421469 Merge "Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe am: beda350d78" into nyc-mr1-dev-plus-aosp 
am: 80a01d8d6d

* commit '80a01d8d6d47b70345dcf15b880c3035ff257797':

Change-Id: If8858526c5e1b18a527d819f65f4cf36be6b3b14
 2016-05-18 22:16:05 +00:00
Robert Carr
2fd8c219b2 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: 9782de1ffd 
am: 3b0a049b11

* commit '3b0a049b1175189c6a6b2f2d0dca05f925ec3b67':
  Fixes for ending PiP animation.

Change-Id: I0cd5217e724182d979c08cc367c24d63dec3a7cc
 2016-05-18 22:16:00 +00:00
Robert Carr
ccdf0310bb Merge "Correct PiP inset adjustment." into nyc-dev am: 54a3dd53fe am: 76ad440346 
am: 0a669e6e98

* commit '0a669e6e983717b96c0cbc2a37ef844e294c5597':
  Correct PiP inset adjustment.

Change-Id: Ic3f200f583179a871f02fb5faa0d1bcd868d98d0
 2016-05-18 22:15:54 +00:00