Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
502,303 Commits 3 Branches 0 Tags
a2b703c95752b8c41b2eacd444bc51d8a46bbd21
Commit Graph

31206 Commits

Author SHA1 Message Date
Adam He
1830552d39 Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev am: 5a3a3f2239 am: c47f8abf1c am: c70f5e6254 am: 970ff93fa9 am: 321c7868fd 
Change-Id: I5f2e3be463ce8a04e5475d4891acb2481ab831a6
 2020-03-30 19:12:15 +00:00
TreeHugger Robot
9bf99ea58b Merge "Make GnssStatus a Parcelable" 2020-03-30 18:40:55 +00:00
Adam He
321c7868fd Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev am: 5a3a3f2239 am: c47f8abf1c am: c70f5e6254 am: 970ff93fa9 
Change-Id: Icfb641f701aabfdb2eadf18265f27210b2bb41d1
 2020-03-30 18:11:11 +00:00
Adam He
5a3a3f2239 Merge "Migrate android.view.inline to android.widget.inline" into rvc-dev 2020-03-30 06:53:35 +00:00
Adam He
f27433af0f Migrate android.view.inline to android.widget.inline 
Old APIs are kept and marked as @hide + @removed to maintain
compatibility.

Bug: 151262653
Test: manual verification
Change-Id: Ia50a1f87c194211be5256e948d43fb54c1cbf941
 2020-03-29 17:29:32 -07:00
Anton Hansson
0588ff0712 Revert "Add new class with APIs of varying visibility" am: 59292377d4 am: 36b5a37236 am: 239d51f3d3 am: d01abf98c5 
Change-Id: I53b9f8515a1c5bc1ed13eb42f7f0948f653c8439
 2020-03-28 18:03:12 +00:00
Anton Hansson
36b5a37236 Revert "Add new class with APIs of varying visibility" am: 59292377d4 
Change-Id: Ief4ab185ade186089e38c3a8976f6ed7681d969a
 2020-03-28 17:14:14 +00:00
Anton Hansson
582cb38829 Merge "Revert "Add new class with APIs of varying visibility"" into rvc-dev 2020-03-28 16:52:49 +00:00
TreeHugger Robot
a79b73f678 Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev am: ddcf560b4e am: 33ad367719 am: 976e8eab2c am: 48de9e2671 
Change-Id: I2a280d80c0c775c57c5a0f71028e5dfdaf197278
 2020-03-28 00:46:43 +00:00
TreeHugger Robot
976e8eab2c Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev am: ddcf560b4e am: 33ad367719 
Change-Id: I642dbfaa3ad8b67881b73e3dafbd7a1da7598363
 2020-03-28 00:06:55 +00:00
TreeHugger Robot
3f1e7189b9 Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev am: ddcf560b4e 
Change-Id: Ie934fdda3129c45adfa3613641a6bbfb3c4e5ffc
 2020-03-28 00:05:40 +00:00
TreeHugger Robot
ddcf560b4e Merge "Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult" into rvc-dev 2020-03-28 00:03:49 +00:00
Automerger Merge Worker
39cff398a9 Merge changes from topic "am-bf6e2799d1e74eec9933cc934f005929" into rvc-qpr-dev-plus-aosp am: 0e1a2f47e4 
Change-Id: I35dc84048c963f08ee164f84aa56061434632115
 2020-03-27 23:39:24 +00:00
Chalard Jean
dba77adf61 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 996492f866 am: 638533bdd4 
Change-Id: I55073e2f5f5bb9293fe2871d8cf82f70ff11ef02
 2020-03-27 23:02:38 +00:00
Chalard Jean
a6526e541e Address further API council comments. am: b0e1e7ec3e am: edd61e038a 
Change-Id: I501465f42c9f476637df652633d006e950d45c8a
 2020-03-27 23:02:33 +00:00
Chalard Jean
645bf7356b Update the NetworkProvider API for council comments am: 14caf974db am: 8db99c076c 
Change-Id: I9e17c9d45e3590f699d612977f16323cd0b908b6
 2020-03-27 23:02:26 +00:00
Chalard Jean
edd61e038a Address further API council comments. am: b0e1e7ec3e 
Change-Id: I539d05a584c40606f0f27bff06e9585407b53cd8
 2020-03-27 22:58:41 +00:00
Chalard Jean
8db99c076c Update the NetworkProvider API for council comments am: 14caf974db 
Change-Id: If7798e35b8c8f4ba4b70cedd9689dcf84caf140f
 2020-03-27 22:58:34 +00:00
Chalard Jean
1a4d936802 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 996492f866 
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
 2020-03-27 22:56:26 +00:00
Chalard Jean
996492f866 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev 
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
 2020-03-27 22:50:42 +00:00
Nicholas Ambur
18e789c83a remove SoundTrigger public member variables am: 1e43767f10 am: f5bd2f0b5c am: 71a34a2072 am: cf40afdfa0 
Change-Id: If14954ed779a4874b7abada226cdd0bd94d4aa84
 2020-03-27 22:38:25 +00:00
Daniel Bright
ef5836157f Remove "@Deprecated" from supplyPinReportResult + supplyPukReportResult 
Fully rolled back comments and signature to original state before change

Test: bootup phone
Bug: 147854704
Change-Id: I5fcd71e1569e6b0e16cff5392239b89259ee1790
 2020-03-27 15:01:16 -07:00
Nicholas Ambur
f5bd2f0b5c remove SoundTrigger public member variables am: 1e43767f10 
Change-Id: I7c8e9ae9196b66447aaa8fed019aaf5261d409da
 2020-03-27 21:19:14 +00:00
TreeHugger Robot
861ef342b9 Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 am: e3f702e10c am: aa25b48303 am: 0103ad7c87 
Change-Id: I6bef732cdbf6122bca03472cb5b45d23de50ca0c
 2020-03-27 21:16:10 +00:00
Nicholas Ambur
95ee3d7ad5 Merge "remove SoundTrigger public member variables" into rvc-dev 2020-03-27 20:54:22 +00:00
TreeHugger Robot
aa25b48303 Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 am: e3f702e10c 
Change-Id: Ifd2c6539a59d1d82a6926b4d2cfd166143ad0bc9
 2020-03-27 20:00:04 +00:00
TreeHugger Robot
cc0c490e57 Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 
Change-Id: Ia996b90814514e35c2baee413ca47b695200bd3d
 2020-03-27 19:52:23 +00:00
TreeHugger Robot
0bf55d7d28 Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev 2020-03-27 19:43:18 +00:00
Automerger Merge Worker
5d8c7cd302 Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf am: 25bdce7fcf am: aa4391ae70" into rvc-qpr-dev-plus-aosp am: 415d437fc2 
Change-Id: Ide81ce96c1eb37860ed44ff724bb48ec215fbc1c
 2020-03-27 19:31:00 +00:00
Galia Peycheva
de7445f0ae Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" into rvc-dev am: 66b1dfe6aa am: 82ee98995e 
Change-Id: I4e3f595731256c154a00c367ee7481e5d1c44639
 2020-03-27 18:55:12 +00:00
Galia Peycheva
c3b45b973c Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" into rvc-dev am: 66b1dfe6aa 
Change-Id: If4e6d21b1a68bb8609437c8ed0d67fb62d98f1ad
 2020-03-27 18:37:55 +00:00
TreeHugger Robot
25bdce7fcf Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf 
Change-Id: Icb0f2d9ce39da5e36ff34a1f10f492a9340312f5
 2020-03-27 18:36:49 +00:00
Galia Peycheva
66b1dfe6aa Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" into rvc-dev 2020-03-27 18:34:49 +00:00
Galia Peycheva
7c901e8488 Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" 2020-03-27 16:34:56 +00:00
TreeHugger Robot
85f2116091 Merge "Add public API for @hidden Bitmap#createAshmemBitmap" 2020-03-27 16:08:33 +00:00
Mihir Patel
6f33b10ab5 Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager 
Bug: 150599209
Test: manual
Change-Id: I3e7b67cf92ddb6405829ec3c6ed2c491b4e77cab
 2020-03-27 15:50:43 +00:00
Jean-Michel Trivi
05b97f72f1 Merge "Address Audio Java API feedback" into rvc-dev am: 5897ede327 am: 692393d97a am: c01a5716d7 am: bc6b2208d7 
Change-Id: I494361a7e3054ff118aae386fb96e51d2da011a9
 2020-03-27 15:41:39 +00:00
Anton Hansson
59292377d4 Revert "Add new class with APIs of varying visibility" 
This reverts commit 7d6704e4b0.

The experiment has concluded, and we don't want these APIs in
the finalized R api.

Also update the newly-arrived module txt files.

Bug: 149108482
Test: m checkapi
Change-Id: I965111b9a8ad2d3e5849bd9dfdae9c00cc471ce6
 2020-03-27 15:36:06 +00:00
Jean-Michel Trivi
692393d97a Merge "Address Audio Java API feedback" into rvc-dev am: 5897ede327 
Change-Id: I5bdb74c8ca6a1d2f1a846e59547f6fe9c3d2399f
 2020-03-27 15:04:29 +00:00
Jean-Michel Trivi
5897ede327 Merge "Address Audio Java API feedback" into rvc-dev 2020-03-27 14:58:53 +00:00
Chalard Jean
2da4f9f9ae Rename satisfiedBy into canBeSatisfiedBy 
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
 2020-03-27 23:46:30 +09:00
Michael Wright
9e4416e62d Merge "Make vibrator effect queries an @IntDef." into rvc-dev am: f51b6aa53a am: c8476eabd3 am: bf1c1d1d72 am: 9400eca1d5 
Change-Id: I410a90dfff292c4177e153b9269dd24cc9eee95c
 2020-03-27 14:43:35 +00:00
Michael Wright
bf1c1d1d72 Merge "Make vibrator effect queries an @IntDef." into rvc-dev am: f51b6aa53a am: c8476eabd3 
Change-Id: Ic82aa12fa73e8c44b0edc497e6fec03455b6af22
 2020-03-27 14:11:23 +00:00
Michael Wright
9207b46640 Merge "Make vibrator effect queries an @IntDef." into rvc-dev am: f51b6aa53a 
Change-Id: I21518e842e15a242de347a0fd8bfeab772fe972f
 2020-03-27 13:44:19 +00:00
Michael Wright
f51b6aa53a Merge "Make vibrator effect queries an @IntDef." into rvc-dev 2020-03-27 13:29:18 +00:00
Santiago Seifert
cc539a14a1 Merge "Add special value for unknown current parser name" into rvc-dev am: 6cf6809826 am: 2d758734f1 am: 4a5a91a747 am: f454eee604 
Change-Id: Ifc8cab05af7076b2083d054e42896addcaa07e6c
 2020-03-27 13:02:57 +00:00
Michael Wright
b33d7a728b Merge "Address API Council feedback." into rvc-dev am: 6d2c6f0255 am: 9792ea41af am: b38b6d16f3 am: eebb92305c 
Change-Id: I69029001a802cea08cf2fedd7344759de25cfa17
 2020-03-27 13:01:38 +00:00
Santiago Seifert
2d758734f1 Merge "Add special value for unknown current parser name" into rvc-dev am: 6cf6809826 
Change-Id: I4091f056db6679128b4cc8b457b9a1b0ba74ce67
 2020-03-27 12:43:22 +00:00
Santiago Seifert
6cf6809826 Merge "Add special value for unknown current parser name" into rvc-dev 2020-03-27 12:41:37 +00:00
Michael Wright
9792ea41af Merge "Address API Council feedback." into rvc-dev am: 6d2c6f0255 
Change-Id: Ia85d8048341a4a13c68c65487806213a73607ff4
 2020-03-27 12:34:54 +00:00